Flatpak: Update build manifests

- point to the upstream repo for wayland
- disable disabling of sassc
- switch wayland from autotools to meson

diff --git a/build-aux/flatpak/org.gtk.Demo4.json b/build-aux/flatpak/org.gtk.Demo4.json
index b987981577aa220877af9d47b412dc5e2c6c3eb9..9922c759e06730d6386eb404b02dd89596aa12e4 100644 (file)
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@@ -43,7 +43,7 @@
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                 }
             ]
         },
@@ -70,7 +70,6 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Denable_vulkan=no",
-                "-Dsassc=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Dprofile=devel"
             ],

diff --git a/build-aux/flatpak/org.gtk.IconBrowser4.json b/build-aux/flatpak/org.gtk.IconBrowser4.json
index 580e4e7af937d84ff33aa3327fa913a8d15f61b9..1c1424499963d507c8490497cc83af37c76e5441 100644 (file)
--- a/build-aux/flatpak/org.gtk.IconBrowser4.json
+++ b/build-aux/flatpak/org.gtk.IconBrowser4.json
@@ -35,15 +35,15 @@
     "modules" : [
         {
             "name" : "wayland",
-            "buildsystem" : "autotools",
+            "buildsystem" : "meson",
             "builddir" : true,
             "config-opts" : [
-                "--disable-documentation"
+                "-Ddocumentation=false"
             ],
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                 }
             ]
         },
@@ -70,7 +70,6 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Denable_vulkan=no",
-                "-Dsassc=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Dprofile=devel"
             ],

diff --git a/build-aux/flatpak/org.gtk.WidgetFactory4.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json
index 138a6c73b515923d321c4c867bbf166007e6a07d..bcbee387e788db3e558690ea51c6ac217a22e81e 100644 (file)
--- a/build-aux/flatpak/org.gtk.WidgetFactory4.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json
@@ -35,15 +35,15 @@
     "modules" : [
         {
             "name" : "wayland",
-            "buildsystem" : "autotools",
+            "buildsystem" : "meson",
             "builddir" : true,
             "config-opts" : [
-                "--disable-documentation"
+                "-Ddocumentation=false"
             ],
             "sources" : [
                 {
                     "type" : "git",
-                    "url" : "https://github.com/wayland-project/wayland.git"
+                    "url" : "https://gitlab.freedesktop.org/wayland/wayland.git"
                 }
             ]
         },
@@ -70,7 +70,6 @@
             "config-opts" : [
                 "--libdir=/app/lib",
                 "-Denable_vulkan=no",
-                "-Dsassc=disabled",
                 "-Dbuildtype=debugoptimized",
                 "-Dprofile=devel"
             ],